From 279d3c08a96f1c2f4f631b6a27ba137112e95e63 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Oct 2020 00:01:25 -0400 Subject: [PATCH] gtk-demo: Rename the transition shader files Easier to find them when their name matches the title that we show in the UI. --- demos/gtk-demo/{transition3.glsl => crosswarp.glsl} | 0 demos/gtk-demo/demo.gresource.xml | 10 +++++----- demos/gtk-demo/gltransition.c | 8 ++++---- demos/gtk-demo/{transition4.glsl => kaleidoscope.glsl} | 0 demos/gtk-demo/{transition2.glsl => radial.glsl} | 0 demos/gtk-demo/{transition1.glsl => wind.glsl} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename demos/gtk-demo/{transition3.glsl => crosswarp.glsl} (100%) rename demos/gtk-demo/{transition4.glsl => kaleidoscope.glsl} (100%) rename demos/gtk-demo/{transition2.glsl => radial.glsl} (100%) rename demos/gtk-demo/{transition1.glsl => wind.glsl} (100%) diff --git a/demos/gtk-demo/transition3.glsl b/demos/gtk-demo/crosswarp.glsl similarity index 100% rename from demos/gtk-demo/transition3.glsl rename to demos/gtk-demo/crosswarp.glsl diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml index 224b4736e2..5dea806cd2 100644 --- a/demos/gtk-demo/demo.gresource.xml +++ b/demos/gtk-demo/demo.gresource.xml @@ -140,13 +140,13 @@ gtkshaderbin.c gskshaderpaintable.h gskshaderpaintable.c + wind.glsl + radial.glsl + crosswarp.glsl + kaleidoscope.glsl + cogs2.glsl ripple.glsl background.glsl - transition1.glsl - transition2.glsl - transition3.glsl - transition4.glsl - cogs2.glsl iconscroll.ui diff --git a/demos/gtk-demo/gltransition.c b/demos/gtk-demo/gltransition.c index b95ffc4d6d..96ccf9acac 100644 --- a/demos/gtk-demo/gltransition.c +++ b/demos/gtk-demo/gltransition.c @@ -320,16 +320,16 @@ create_gltransition_window (GtkWidget *do_widget) gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE); gtk_grid_attach (GTK_GRID (grid), - make_shader_stack ("Wind", "/gltransition/transition1.glsl", 0, scale), + make_shader_stack ("Wind", "/gltransition/wind.glsl", 0, scale), 0, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), - make_shader_stack ("Radial", "/gltransition/transition2.glsl", 1, scale), + make_shader_stack ("Radial", "/gltransition/radial.glsl", 1, scale), 1, 0, 1, 1); gtk_grid_attach (GTK_GRID (grid), - make_shader_stack ("Crosswarp", "/gltransition/transition3.glsl", 2, scale), + make_shader_stack ("Crosswarp", "/gltransition/crosswarp.glsl", 2, scale), 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), - make_shader_stack ("Kaleidoscope", "/gltransition/transition4.glsl", 3, scale), + make_shader_stack ("Kaleidoscope", "/gltransition/kaleidoscope.glsl", 3, scale), 1, 1, 1, 1); return window; diff --git a/demos/gtk-demo/transition4.glsl b/demos/gtk-demo/kaleidoscope.glsl similarity index 100% rename from demos/gtk-demo/transition4.glsl rename to demos/gtk-demo/kaleidoscope.glsl diff --git a/demos/gtk-demo/transition2.glsl b/demos/gtk-demo/radial.glsl similarity index 100% rename from demos/gtk-demo/transition2.glsl rename to demos/gtk-demo/radial.glsl diff --git a/demos/gtk-demo/transition1.glsl b/demos/gtk-demo/wind.glsl similarity index 100% rename from demos/gtk-demo/transition1.glsl rename to demos/gtk-demo/wind.glsl -- 2.30.2